perf: fix bug in code to print out metrics

We don't normally hit the code in scripting.js to print metrics
because shell-perf-tool bypasses it, but there was a left-over
in the code that no longer works. Also add in the units to the
output.

https://bugzilla.gnome.org/show_bug.cgi?id=732349

diff --git a/js/ui/scripting.js b/js/ui/scripting.js
index 72f670261fcd3a952afa97785504a0ebb8b7c82f..f952ed07b12174bbeac02f88633926aadc874442 100644 (file)
--- a/js/ui/scripting.js
+++ b/js/ui/scripting.js
@@ -306,8 +306,8 @@ function _collect(scriptModule, outputFile) {
         print ('------------------------------------------------------------');
         for (let i = 0; i < metrics.length; i++) {
             let metric = metrics[i];
-            print ('# ' + scriptModule.METRIC_DESCRIPTIONS[metric]);
-            print (metric + ': ' +  scriptModule.METRICS[metric]);
+            print ('# ' + scriptModule.METRICS[metric].description);
+            print (metric + ': ' +  scriptModule.METRICS[metric].value + scriptModule.METRICS[metric].units);
         }
         print ('------------------------------------------------------------');
     }